Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick to 7.10: packaging backports #22076

Conversation

mdelapenya
Copy link
Contributor

Backports the following commits to 7.10:

mdelapenya and others added 9 commits October 22, 2020 12:02
…lastic#21100)

* feat: add a new step to run the e2e tests for certain parts of Beats

We are going to trigger the tests for those parts affected by the
elastic-agent, filebeat, or metricbeat, because those are the ones we
verify  in the e2e-testing suite

* chore: do not include heartbeat

* feat: trigger the e2e tests

* fix: use relative path

* chore: use proper target branch name for PRs

* chore: use different tag

* fix: use proper env variable

* chore: pass github checks context to downstream job

* chore: revert shared lib version

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: add BASE_DIR env variable

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: remove duplicated env

* ffix: add param comma separator

* fix: wrong copy&paste

* chore: move e2e GH check out of the release context

* chore: simplify conditional logic

* chore: refine execution of test suites

* fix: use proper parameter name

* chore: set metricbeat version

* chore: remove slack notifications on PRs

* chore: update parameter

* chore: run multiple test suites per beat type

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
* fix: set versions ony for PRs

We want to use default versions per branch when running after a merge

* fix: add trailing comma

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
* fix: push ubi8 images too

* chore: enhance retries

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: use variables in log

* chore: add "-oss" images

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
* fix: remove extra curly brace

* chore: proper indent
It will create the artifacts with some requirements related to integrity
* chore: pass beat as a method argument (no side-effects)

* chore: run tests in a separate stage

* fix: use parenthesis

* chore: update comment

* chore: do not trigger E2E tests if no suite was added

* fix: use missing curly brackets

* fix: wrong closure wrapping

* fix: condition was not set
* fix: delegate pushes to variants

* chore: group conditions for x-pack

* chore: simplify with endsWith

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
* feat: push aliases for docker images

* feat: build alias for snapshots

* fix: only update alias on snapshots

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

* fix: wrong image name for alias

* fix: reuse variable as groovy does not hide variables by scope

* chore: extract common logic to a method

* Revert "fix: only update alias on snapshots"

This reverts commit cff2cef.

* Revert "feat: build alias for snapshots"

This reverts commit 707e0d7.

* chore: do not push aliases for PRs

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
@mdelapenya mdelapenya self-assigned this Oct 22, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 22, 2020
@mdelapenya mdelapenya changed the title Cherry-pick to 7.10: feat: add a new step to run the e2e tests for certain parts of Beats (#21100) | [E2E Tests] fix: set versions ony for PRs (#21608) | [CI: Packaging] fix: push ubi8 images too (#21621) | fix: remove extra curly brace in Cherry-pick to 7.10: packaging backports Oct 22, 2020
@mdelapenya mdelapenya added the Team:Automation Label for the Observability productivity team label Oct 22, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 22, 2020
.ci/packaging.groovy Outdated Show resolved Hide resolved
@@ -149,75 +159,174 @@ pipeline {
}
}
}
stage('Run E2E Tests for Packages'){
agent { label 'ubuntu && immutable' }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we apply this to master and then backport?

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 22, 2020

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22076 updated]

  • Start Time: 2020-10-22T10:15:19.138+0000

  • Duration: 31 min 41 sec

@mdelapenya mdelapenya merged commit 624c459 into elastic:7.10 Oct 22, 2020
jsoriano pushed a commit to jsoriano/beats that referenced this pull request Dec 15, 2020
* feat: add a new step to run the e2e tests for certain parts of Beats (elastic#21100)

* feat: add a new step to run the e2e tests for certain parts of Beats

We are going to trigger the tests for those parts affected by the
elastic-agent, filebeat, or metricbeat, because those are the ones we
verify  in the e2e-testing suite

* chore: do not include heartbeat

* feat: trigger the e2e tests

* fix: use relative path

* chore: use proper target branch name for PRs

* chore: use different tag

* fix: use proper env variable

* chore: pass github checks context to downstream job

* chore: revert shared lib version

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: add BASE_DIR env variable

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: remove duplicated env

* ffix: add param comma separator

* fix: wrong copy&paste

* chore: move e2e GH check out of the release context

* chore: simplify conditional logic

* chore: refine execution of test suites

* fix: use proper parameter name

* chore: set metricbeat version

* chore: remove slack notifications on PRs

* chore: update parameter

* chore: run multiple test suites per beat type

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* [E2E Tests] fix: set versions ony for PRs (elastic#21608)

* fix: set versions ony for PRs

We want to use default versions per branch when running after a merge

* fix: add trailing comma

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* [CI: Packaging] fix: push ubi8 images too (elastic#21621)

* fix: push ubi8 images too

* chore: enhance retries

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* chore: use variables in log

* chore: add "-oss" images

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* fix: remove extra curly brace in script (elastic#21692)

* fix: remove extra curly brace

* chore: proper indent

* fix: update fleet test suite name (elastic#21738)

* chore: create CI artifacts for DEV usage (elastic#21645)

It will create the artifacts with some requirements related to integrity

* chore: simplify triggering the E2E tests for Beats (elastic#21790)

* chore: pass beat as a method argument (no side-effects)

* chore: run tests in a separate stage

* fix: use parenthesis

* chore: update comment

* chore: do not trigger E2E tests if no suite was added

* fix: use missing curly brackets

* fix: wrong closure wrapping

* fix: condition was not set

* chore: delegate variant pushes to the right method (elastic#21861)

* fix: delegate pushes to variants

* chore: group conditions for x-pack

* chore: simplify with endsWith

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* feat: package aliases for snapshots (elastic#21960)

* feat: push aliases for docker images

* feat: build alias for snapshots

* fix: only update alias on snapshots

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

* fix: wrong image name for alias

* fix: reuse variable as groovy does not hide variables by scope

* chore: extract common logic to a method

* Revert "fix: only update alias on snapshots"

This reverts commit cff2cef.

* Revert "feat: build alias for snapshots"

This reverts commit 707e0d7.

* chore: do not push aliases for PRs

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

* chore: Use third number as x

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
(cherry picked from commit 624c459)
jsoriano added a commit that referenced this pull request Jan 7, 2021
…23142)

Backports the following commits to 7.x:
* feat: add a new step to run the e2e tests for certain parts of Beats (#21100)
* [E2E Tests] fix: set versions ony for PRs (#21608)
* [CI: Packaging] fix: push ubi8 images too (#21621)
* fix: remove extra curly brace in script (#21692)
* fix: update fleet test suite name (#21738)
* chore: create CI artifacts for DEV usage (#21645)
* chore: simplify triggering the E2E tests for Beats (#21790)
* chore: delegate variant pushes to the right method (#21861)
* feat: package aliases for snapshots (#21960)
* fix: use proper param name for e2e tests (#22836)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
jsoriano added a commit to jsoriano/beats that referenced this pull request Jan 7, 2021
…ports (elastic#23142)

Backports the following commits to 7.x:
* feat: add a new step to run the e2e tests for certain parts of Beats (elastic#21100)
* [E2E Tests] fix: set versions ony for PRs (elastic#21608)
* [CI: Packaging] fix: push ubi8 images too (elastic#21621)
* fix: remove extra curly brace in script (elastic#21692)
* fix: update fleet test suite name (elastic#21738)
* chore: create CI artifacts for DEV usage (elastic#21645)
* chore: simplify triggering the E2E tests for Beats (elastic#21790)
* chore: delegate variant pushes to the right method (elastic#21861)
* feat: package aliases for snapshots (elastic#21960)
* fix: use proper param name for e2e tests (elastic#22836)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
(cherry picked from commit 1006bd9)
jsoriano added a commit that referenced this pull request Jan 15, 2021
…23142) (#23396)

Backports the following commits to 7.x:
* feat: add a new step to run the e2e tests for certain parts of Beats (#21100)
* [E2E Tests] fix: set versions ony for PRs (#21608)
* [CI: Packaging] fix: push ubi8 images too (#21621)
* fix: remove extra curly brace in script (#21692)
* fix: update fleet test suite name (#21738)
* chore: create CI artifacts for DEV usage (#21645)
* chore: simplify triggering the E2E tests for Beats (#21790)
* chore: delegate variant pushes to the right method (#21861)
* feat: package aliases for snapshots (#21960)
* fix: use proper param name for e2e tests (#22836)

(cherry picked from commit 1006bd9)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Automation Label for the Observability productivity team v7.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants